Merge pull request #162 from HRogge/master

author Bastian Bittorf <[email protected]>

Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)

committer Bastian Bittorf <[email protected]>

Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)
author Bastian Bittorf <[email protected]>
Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)
committer Bastian Bittorf <[email protected]>
Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)
diff --cc oonf-dlep-proxy/Makefile
Simple merge
diff --cc oonf-dlep-radio/Makefile
Simple merge
diff --cc oonf-olsrd2/Makefile
Simple merge
author	Bastian Bittorf <[email protected]>
	Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)
committer	Bastian Bittorf <[email protected]>
	Sat, 19 Mar 2016 15:40:21 +0000 (16:40 +0100)
		1	2
oonf-dlep-proxy/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
oonf-dlep-radio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
oonf-olsrd2/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history